From 9194b7388f6e98db4aa3ea1105a050c60d1ea2a6 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 13 Apr 2020 00:43:19 -0400
Subject: [PATCH] Add a GtkAppChooserButton:modal property

Nowadays, dialogs are expected to be attached, typically,
and that only happens when they are marked as modal.
---
 docs/reference/gtk/gtk4-sections.txt |  2 +
 gtk/gtkappchooserbutton.c            | 60 +++++++++++++++++++++++++++-
 gtk/gtkappchooserbutton.h            |  6 +++
 3 files changed, 67 insertions(+), 1 deletion(-)

diff --git a/docs/reference/gtk/gtk4-sections.txt b/docs/reference/gtk/gtk4-sections.txt
index cf6e42c3c4..d438d4bc3d 100644
--- a/docs/reference/gtk/gtk4-sections.txt
+++ b/docs/reference/gtk/gtk4-sections.txt
@@ -5343,6 +5343,8 @@ gtk_app_chooser_button_get_show_dialog_item
 gtk_app_chooser_button_set_show_dialog_item
 gtk_app_chooser_button_get_heading
 gtk_app_chooser_button_set_heading
+gtk_app_chooser_button_get_modal
+gtk_app_chooser_button_set_modal
 
 <SUBSECTION Standard>
 GTK_TYPE_APP_CHOOSER_BUTTON
diff --git a/gtk/gtkappchooserbutton.c b/gtk/gtkappchooserbutton.c
index 0580b5a333..e8698ceac5 100644
--- a/gtk/gtkappchooserbutton.c
+++ b/gtk/gtkappchooserbutton.c
@@ -66,6 +66,7 @@ enum {
   PROP_SHOW_DIALOG_ITEM = 1,
   PROP_SHOW_DEFAULT_ITEM,
   PROP_HEADING,
+  PROP_MODAL,
   NUM_PROPERTIES,
 
   PROP_CONTENT_TYPE = NUM_PROPERTIES
@@ -129,6 +130,7 @@ typedef struct
   gint last_active;
   gboolean show_dialog_item;
   gboolean show_default_item;
+  gboolean modal;
 
   GHashTable *custom_item_names;
 } GtkAppChooserButtonPrivate;
@@ -280,7 +282,7 @@ other_application_item_activated_cb (GtkAppChooserButton *self)
   dialog = gtk_app_chooser_dialog_new_for_content_type (GTK_WINDOW (root),
                                                         GTK_DIALOG_DESTROY_WITH_PARENT,
                                                         priv->content_type);
-  gtk_window_set_modal (GTK_WINDOW (dialog), gtk_window_get_modal (GTK_WINDOW (root)));
+  gtk_window_set_modal (GTK_WINDOW (dialog), priv->modal | gtk_window_get_modal (GTK_WINDOW (root)));
   gtk_app_chooser_dialog_set_heading (GTK_APP_CHOOSER_DIALOG (dialog), priv->heading);
 
   widget = gtk_app_chooser_dialog_get_widget (GTK_APP_CHOOSER_DIALOG (dialog));
@@ -569,6 +571,9 @@ gtk_app_chooser_button_set_property (GObject      *obj,
     case PROP_HEADING:
       gtk_app_chooser_button_set_heading (self, g_value_get_string (value));
       break;
+    case PROP_MODAL:
+      gtk_app_chooser_button_set_modal (self, g_value_get_boolean (value));
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, property_id, pspec);
       break;
@@ -598,6 +603,9 @@ gtk_app_chooser_button_get_property (GObject    *obj,
     case PROP_HEADING:
       g_value_set_string (value, priv->heading);
       break;
+    case PROP_MODAL:
+      g_value_set_boolean (value, priv->modal);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, property_id, pspec);
       break;
@@ -714,6 +722,12 @@ gtk_app_chooser_button_class_init (GtkAppChooserButtonClass *klass)
                          NULL,
                          G_PARAM_READWRITE|G_PARAM_STATIC_STRINGS|G_PARAM_EXPLICIT_NOTIFY);
 
+  properties[PROP_MODAL] =
+    g_param_spec_boolean ("modal",
+                          P_("Modal"),
+                          P_("Whether the dialog should be modal"),
+                          TRUE,
+                          G_PARAM_READWRITE|G_PARAM_CONSTRUCT|G_PARAM_STATIC_STRINGS|G_PARAM_EXPLICIT_NOTIFY);
   g_object_class_install_properties (oclass, NUM_PROPERTIES, properties);
 
   signals[SIGNAL_CHANGED] =
@@ -753,6 +767,8 @@ gtk_app_chooser_button_init (GtkAppChooserButton *self)
 {
   GtkAppChooserButtonPrivate *priv = gtk_app_chooser_button_get_instance_private (self);
 
+  priv->modal = TRUE;
+
   priv->custom_item_names = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
   priv->store = gtk_list_store_new (NUM_COLUMNS,
                                     G_TYPE_APP_INFO,
@@ -1069,3 +1085,45 @@ gtk_app_chooser_button_get_heading (GtkAppChooserButton *self)
 
   return priv->heading;
 }
+
+/**
+ * gtk_app_chooser_button_set_modal:
+ * @self: a #GtkAppChooserButton
+ * @modal: %TRUE to make the dialog modal
+ *
+ * Sets whether the dialog should be modal.
+ */
+void
+gtk_app_chooser_button_set_modal (GtkAppChooserButton *self,
+                                  gboolean             modal)
+{
+  GtkAppChooserButtonPrivate *priv = gtk_app_chooser_button_get_instance_private (self);
+
+  g_return_if_fail (GTK_IS_APP_CHOOSER_BUTTON (self));
+
+  if (priv->modal == modal)
+    return;
+
+  priv->modal = modal;
+
+  g_object_notify (G_OBJECT (self), "modal");
+}
+
+/**
+ * gtk_app_chooser_button_get_modal:
+ * @self: a #GtkAppChooserButton
+ *
+ * Gets whether the dialog is modal.
+ *
+ * Returns: %TRUE if the dialog is modal
+ */
+gboolean
+gtk_app_chooser_button_get_modal (GtkAppChooserButton *self)
+{
+  GtkAppChooserButtonPrivate *priv = gtk_app_chooser_button_get_instance_private (self);
+
+  g_return_val_if_fail (GTK_IS_APP_CHOOSER_BUTTON (self), FALSE);
+
+  return priv->modal;
+}
+
diff --git a/gtk/gtkappchooserbutton.h b/gtk/gtkappchooserbutton.h
index c57456aeef..91083b28eb 100644
--- a/gtk/gtkappchooserbutton.h
+++ b/gtk/gtkappchooserbutton.h
@@ -71,6 +71,12 @@ void     gtk_app_chooser_button_set_show_default_item (GtkAppChooserButton *self
 GDK_AVAILABLE_IN_ALL
 gboolean gtk_app_chooser_button_get_show_default_item (GtkAppChooserButton *self);
 
+GDK_AVAILABLE_IN_ALL
+gboolean gtk_app_chooser_button_get_modal             (GtkAppChooserButton *self);
+GDK_AVAILABLE_IN_ALL
+void     gtk_app_chooser_button_set_modal             (GtkAppChooserButton *self,
+                                                       gboolean             modal);
+
 G_END_DECLS
 
 #endif /* __GTK_APP_CHOOSER_BUTTON_H__ */
-- 
2.30.2